Merge remote-tracking branch 'aperezdc/fixes'
authorColin Walters <walters@verbum.org>
Tue, 28 Aug 2012 13:45:39 +0000 (09:45 -0400)
committerColin Walters <walters@verbum.org>
Tue, 28 Aug 2012 13:45:39 +0000 (09:45 -0400)
commit2527f81abc3655969f4f74d40d343feb5ddd2e0f
tree64794af78e60ee756ef1e9d2c914eb4db1a814c3
parenta17a8e1f4ed9e19b1ee838fb20eaf27bf7ecfad5
parentb314b25e6ac52da142edf3553054cc3d5523c196
Merge remote-tracking branch 'aperezdc/fixes'